Fix some C99isms.

2004-11-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (update_node): Fix some C99isms.

diff --git a/ChangeLog b/ChangeLog
index db565e1553cce983772c738077ebbb7890f1f35d..94a5bcd069239a9af7fd94e38040150aefb81bb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * gtk/gtkuimanager.c (update_node): Remove two more places
        where we were unconditionally setting "visible", causing
        unnecessary notifications.
+       (update_node): Fix some C99isms.
 
        * gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
        (gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db565e1553cce983772c738077ebbb7890f1f35d..94a5bcd069239a9af7fd94e38040150aefb81bb7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,6 +3,7 @@
        * gtk/gtkuimanager.c (update_node): Remove two more places
        where we were unconditionally setting "visible", causing
        unnecessary notifications.
+       (update_node): Fix some C99isms.
 
        * gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
        (gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db565e1553cce983772c738077ebbb7890f1f35d..94a5bcd069239a9af7fd94e38040150aefb81bb7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -3,6 +3,7 @@
        * gtk/gtkuimanager.c (update_node): Remove two more places
        where we were unconditionally setting "visible", causing
        unnecessary notifications.
+       (update_node): Fix some C99isms.
 
        * gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
        (gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db565e1553cce983772c738077ebbb7890f1f35d..94a5bcd069239a9af7fd94e38040150aefb81bb7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -3,6 +3,7 @@
        * gtk/gtkuimanager.c (update_node): Remove two more places
        where we were unconditionally setting "visible", causing
        unnecessary notifications.
+       (update_node): Fix some C99isms.
 
        * gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
        (gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 7803248f6fec3789db36e291675a88733efb1646..62804547d4babd300b9d2a67373f7920652b6eca 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2036,6 +2036,9 @@ update_node (GtkUIManager *self,
   GNode *child;
   GtkAction *action;
   gchar *tooltip;
+  const gchar *action_name;
+  NodeUIReference *ref;
+  
 #ifdef DEBUG_UI_MANAGER
   GList *tmp;
 #endif
@@ -2063,9 +2066,6 @@ update_node (GtkUIManager *self,
   g_print (")\n");
 #endif
 
-  const gchar *action_name;
-  NodeUIReference *ref;
-  
   if (info->uifiles == NULL) {
     /* We may need to remove this node.
      * This must be done in post order